Merge git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Sat, 2 Jan 2016 17:24:43 +0000 (12:24 -0500)
committerTom Rini <[email protected]>
Sat, 2 Jan 2016 17:24:43 +0000 (12:24 -0500)

Trivial merge